From e5927ae4e566f6d6aa4621b74cf5d6c35a011b81 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 28 Oct 2017 20:46:43 +0100 Subject: [PATCH] mac80211: Avoid ABI change in 4.13.5 Commit 531682159092 ("mac80211: fix VLAN handling with TXQs") replaced a union with two separate members in ieee80211_tx_info::control. The one which changed offset (enqueue_time) doesn't appear to be accessed outside of the mac80211 module, so this shouldn't be an ABI change for drivers. Therefore hide the ABI change from genksyms. Gbp-Pq: Topic debian Gbp-Pq: Name mac80211-avoid-abi-change-in-4.13.5.patch --- include/net/mac80211.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 885690fa39c..5ecb2ec1106 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -919,10 +919,19 @@ struct ieee80211_tx_info { unsigned long jiffies; }; /* NB: vif can be NULL for injected frames */ +#ifndef __GENKSYMS__ struct ieee80211_vif *vif; +#else + union { + struct ieee80211_vif *vif; + codel_time_t enqueue_time; + }; +#endif struct ieee80211_key_conf *hw_key; u32 flags; +#ifndef __GENKSYMS__ codel_time_t enqueue_time; +#endif } control; struct { u64 cookie; -- 2.30.2